
public class User{

	private int age;
    private int id;//branch in master

	private int id;
	private String name;//branch in fix;

	
}